gnulib: adjust to upstream _HEADERS change

diff --cc ChangeLog
index 1ba35554bebd9bb17c14327620c69e5934d3b487,1ba35554bebd9bb17c14327620c69e5934d3b487..6b5cbe02b2c359eff10a2beec0b0dc689c6d004f
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,3 -1,3 +1,14 @@@
++2011-02-06  Paul Eggert  <eggert@cs.ucla.edu>
++
++      gnulib: adjust to upstream _HEADERS change
++      * lib/Makefile.am (EXTRA_HEADERS, nodist_pkginclude_HEADERS):
++      New empty macros, to accommodate recent changes to gnulib.  See
++      <http://lists.gnu.org/archive/html/bug-gnulib/2011-02/msg00068.html>.
++      * c++defs.h, lib/Makefile.in, lib/ftoastr.h, lib/getopt.in.h:
++      * lib/gnulib.mk, lib/ignore-value.h, lib/stdbool.in.h, lib/stddef.in.h:
++      * lib/time.in.h, lib/unistd.in.h:
++      Regenerate.
++
  2011-02-05  Paul Eggert  <eggert@cs.ucla.edu>
  
        sync from gnulib to remove HAVE_STDBOOL_H

diff --cc c++defs.h
index d521417069ad02d6e9442316cd65b71a007c0987,d521417069ad02d6e9442316cd65b71a007c0987..e4b1b2ecf4fc9bc7feb7df5ec7394a7a91460dee
--- 1/c++defs.h
--- 2/c++defs.h
+++ b/c++defs.h
@@@ -14,8 -14,8 +14,8 @@@
     You should have received a copy of the GNU General Public License
     along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
  
--#ifndef _GL_CXXDEFS_H
--#define _GL_CXXDEFS_H
++#ifndef _gl_GL_CXXDEFS_H
++#define _gl_GL_CXXDEFS_H
  
  /* The three most frequent use cases of these macros are:
  
@@@ -268,4 -268,4 +268,4 @@@
      _GL_EXTERN_C int _gl_cxxalias_dummy
  #endif
  
--#endif /* _GL_CXXDEFS_H */
++#endif /* _gl_GL_CXXDEFS_H */

diff --cc lib/Makefile.am
index 6a014f6057b757fb78d0dfba39fe32ae147188a1,6a014f6057b757fb78d0dfba39fe32ae147188a1..e63561d0abbe7f78bd1c2a2607ca2c486b926ec8
--- 1/lib/Makefile.am
--- 2/lib/Makefile.am
+++ b/lib/Makefile.am
@@@ -1,6 -1,6 +1,8 @@@
  BUILT_SOURCES =
  EXTRA_DIST =
++EXTRA_HEADERS =
  MOSTLYCLEANFILES =
++nodist_pkginclude_HEADERS =
  noinst_LIBRARIES =
  
  DEFAULT_INCLUDES = -I. -I../src -I$(top_srcdir)/src

diff --cc lib/Makefile.in
index e50f9b31ef32a8cfdf0d37f5076adbec008d041c,e50f9b31ef32a8cfdf0d37f5076adbec008d041c..0dac3d8dc9015f9a92bff3db2b2696a3c36186d1
--- 1/lib/Makefile.in
--- 2/lib/Makefile.in
+++ b/lib/Makefile.in
@@@ -26,6 -26,6 +26,7 @@@
  # Generated by gnulib-tool.
  # Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=. --makefile-name=gnulib.mk --no-libtool --macro-prefix=gl --no-vc-files dtoastr getopt-gnu ignore-value mktime strftime
  
++
  VPATH = @srcdir@
  pkgdatadir = $(datadir)/@PACKAGE@
  pkgincludedir = $(includedir)/@PACKAGE@
@@@ -81,6 -81,6 +82,29 @@@ CCLD = $(CC
  LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
  SOURCES = $(libgnu_a_SOURCES) $(EXTRA_libgnu_a_SOURCES)
  DIST_SOURCES = $(libgnu_a_SOURCES) $(EXTRA_libgnu_a_SOURCES)
++am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
++am__vpath_adj = case $$p in \
++    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
++    *) f=$$p;; \
++  esac;
++am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
++am__install_max = 40
++am__nobase_strip_setup = \
++  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
++am__nobase_strip = \
++  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
++am__nobase_list = $(am__nobase_strip_setup); \
++  for p in $$list; do echo "$$p $$p"; done | \
++  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
++  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
++    if (++n[$$2] == $(am__install_max)) \
++      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
++    END { for (dir in files) print dir, files[dir] }'
++am__base_list = \
++  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
++  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
++am__installdirs = "$(DESTDIR)$(pkgincludedir)"
++HEADERS = $(nodist_pkginclude_HEADERS)
  ETAGS = etags
  CTAGS = ctags
  DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@@ -477,10 -477,10 +501,13 @@@ EXTRA_DIST = $(top_srcdir)/./arg-nonnul
        getopt_int.h intprops.h mktime-internal.h mktime.c \
        stdbool.in.h stddef.in.h strftime.c strftime.h time.in.h \
        time_r.c unistd.in.h $(top_srcdir)/./warn-on-use.h
++EXTRA_HEADERS = getopt.h stdbool.h stddef.h
  MOSTLYCLEANFILES = core *.stackdump arg-nonnull.h arg-nonnull.h-t \
        c++defs.h c++defs.h-t getopt.h getopt.h-t stdbool.h \
        stdbool.h-t stddef.h stddef.h-t time.h time.h-t unistd.h \
        unistd.h-t warn-on-use.h warn-on-use.h-t
++nodist_pkginclude_HEADERS = arg-nonnull.h c++defs.h $(GETOPT_H) \
++      $(STDBOOL_H) $(STDDEF_H) time.h unistd.h warn-on-use.h
  noinst_LIBRARIES = libgnu.a
  DEFAULT_INCLUDES = -I. -I../src -I$(top_srcdir)/src
  libgnu_a_SOURCES = dtoastr.c gettext.h ignore-value.h
@@@ -561,6 -561,6 +588,26 @@@ distclean-compile
  @AMDEP_TRUE@@am__fastdepCC_FALSE@     source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCC_FALSE@     DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
++install-nodist_pkgincludeHEADERS: $(nodist_pkginclude_HEADERS)
++      @$(NORMAL_INSTALL)
++      test -z "$(pkgincludedir)" || $(MKDIR_P) "$(DESTDIR)$(pkgincludedir)"
++      @list='$(nodist_pkginclude_HEADERS)'; test -n "$(pkgincludedir)" || list=; \
++      for p in $$list; do \
++        if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
++        echo "$$d$$p"; \
++      done | $(am__base_list) | \
++      while read files; do \
++        echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(pkgincludedir)'"; \
++        $(INSTALL_HEADER) $$files "$(DESTDIR)$(pkgincludedir)" || exit $$?; \
++      done
++
++uninstall-nodist_pkgincludeHEADERS:
++      @$(NORMAL_UNINSTALL)
++      @list='$(nodist_pkginclude_HEADERS)'; test -n "$(pkgincludedir)" || list=; \
++      files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
++      test -n "$$files" || exit 0; \
++      echo " ( cd '$(DESTDIR)$(pkgincludedir)' && rm -f" $$files ")"; \
++      cd "$(DESTDIR)$(pkgincludedir)" && rm -f $$files
  
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
        list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
@@@ -647,8 -647,8 +694,11 @@@ distdir: $(DISTFILES
  check-am: all-am
  check: $(BUILT_SOURCES)
        $(MAKE) $(AM_MAKEFLAGS) check-am
--all-am: Makefile $(LIBRARIES)
++all-am: Makefile $(LIBRARIES) $(HEADERS)
  installdirs:
++      for dir in "$(DESTDIR)$(pkgincludedir)"; do \
++        test -z "$$dir" || $(MKDIR_P) "$$dir"; \
++      done
  install: $(BUILT_SOURCES)
        $(MAKE) $(AM_MAKEFLAGS) install-am
  install-exec: install-exec-am
@@@ -699,7 -699,7 +749,7 @@@ info: info-a
  
  info-am:
  
--install-data-am:
++install-data-am: install-nodist_pkgincludeHEADERS
  
  install-dvi: install-dvi-am
  
@@@ -745,7 -745,7 +795,7 @@@ ps: ps-a
  
  ps-am:
  
--uninstall-am:
++uninstall-am: uninstall-nodist_pkgincludeHEADERS
  
  .MAKE: all check install install-am install-strip
  
@@@ -755,12 -755,12 +805,13 @@@
        html-am info info-am install install-am install-data \
        install-data-am install-dvi install-dvi-am install-exec \
        install-exec-am install-html install-html-am install-info \
--      install-info-am install-man install-pdf install-pdf-am \
--      install-ps install-ps-am install-strip installcheck \
--      installcheck-am installdirs maintainer-clean \
--      maintainer-clean-generic mostlyclean mostlyclean-compile \
--      mostlyclean-generic mostlyclean-local pdf pdf-am ps ps-am tags \
--      uninstall uninstall-am
++      install-info-am install-man install-nodist_pkgincludeHEADERS \
++      install-pdf install-pdf-am install-ps install-ps-am \
++      install-strip installcheck installcheck-am installdirs \
++      maintainer-clean maintainer-clean-generic mostlyclean \
++      mostlyclean-compile mostlyclean-generic mostlyclean-local pdf \
++      pdf-am ps ps-am tags uninstall uninstall-am \
++      uninstall-nodist_pkgincludeHEADERS
  
  # The arg-nonnull.h that gets inserted into generated .h files is the same as
  # build-aux/arg-nonnull.h, except that it has the copyright header cut off.

diff --cc lib/ftoastr.h
index 6264952e8e97e1563afd351c038af3823e777cf6,6264952e8e97e1563afd351c038af3823e777cf6..8aacb7908ce24800c80e9446e1560794467c40da
--- 1/lib/ftoastr.h
--- 2/lib/ftoastr.h
+++ b/lib/ftoastr.h
@@@ -17,7 -17,7 +17,7 @@@
  
  /* Written by Paul Eggert.  */
  
--#ifndef _GL_FTOASTR_H
++#ifndef _gl_GL_FTOASTR_H
  
  #include "intprops.h"
  #include <float.h>
@@@ -141,4 -141,4 +141,4 @@@ enu
  #define  DBL_BUFSIZE_BOUND ( DBL_STRLEN_BOUND + 1)
  #define LDBL_BUFSIZE_BOUND (LDBL_STRLEN_BOUND + 1)
  
--#endif /* _GL_FTOASTR_H */
++#endif /* _gl_GL_FTOASTR_H */

diff --cc lib/getopt.in.h
index 9b0a9a58bc91fd9557bc9f2fea7006aec8c90044,9b0a9a58bc91fd9557bc9f2fea7006aec8c90044..9f6341ccdcd5d3343a236afc863272c47cf605e7
--- 1/lib/getopt.in.h
--- 2/lib/getopt.in.h
+++ b/lib/getopt.in.h
@@@ -16,7 -16,7 +16,7 @@@
     You should have received a copy of the GNU General Public License
     along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
  
--#ifndef _GL_GETOPT_H
++#ifndef _gl_GL_GETOPT_H
  
  #if __GNUC__ >= 3
  @PRAGMA_SYSTEM_HEADER@
@@@ -32,10 -32,10 +32,10 @@@
  # undef _GL_SYSTEM_GETOPT
  #endif
  
--#ifndef _GL_GETOPT_H
++#ifndef _gl_GL_GETOPT_H
  
  #ifndef __need_getopt
--# define _GL_GETOPT_H 1
++# define _gl_GL_GETOPT_H 1
  #endif
  
  /* Standalone applications should #define __GETOPT_PREFIX to an

diff --cc lib/gnulib.mk
index af628c8d30086bce40901a2f158d27457bdd46fa,af628c8d30086bce40901a2f158d27457bdd46fa..ee95349b565d40c3ca6d85d9c98afab143b0fd02
--- 1/lib/gnulib.mk
--- 2/lib/gnulib.mk
+++ b/lib/gnulib.mk
@@@ -23,6 -23,6 +23,8 @@@ EXTRA_libgnu_a_SOURCES 
  
  ## begin gnulib module arg-nonnull
  
++nodist_pkginclude_HEADERS += arg-nonnull.h
++
  # The BUILT_SOURCES created by this Makefile snippet are not used via #include
  # statements but through direct file reference. Therefore this snippet must be
  # present in all Makefile.am that need it. This is ensured by the applicability
@@@ -47,6 -47,6 +49,8 @@@ EXTRA_DIST += $(top_srcdir)/./arg-nonnu
  
  ## begin gnulib module c++defs
  
++nodist_pkginclude_HEADERS += c++defs.h
++
  # The BUILT_SOURCES created by this Makefile snippet are not used via #include
  # statements but through direct file reference. Therefore this snippet must be
  # present in all Makefile.am that need it. This is ensured by the applicability
@@@ -81,6 -81,6 +85,9 @@@ EXTRA_libgnu_a_SOURCES += ftoastr.
  
  ## begin gnulib module getopt-posix
  
++nodist_pkginclude_HEADERS += $(GETOPT_H)
++EXTRA_HEADERS += getopt.h
++
  BUILT_SOURCES += $(GETOPT_H)
  
  # We need the following in order to create <getopt.h> when the system
@@@ -135,6 -135,6 +142,9 @@@ EXTRA_libgnu_a_SOURCES += mktime.
  
  ## begin gnulib module stdbool
  
++nodist_pkginclude_HEADERS += $(STDBOOL_H)
++EXTRA_HEADERS += stdbool.h
++
  BUILT_SOURCES += $(STDBOOL_H)
  
  # We need the following in order to create <stdbool.h> when the system
@@@ -153,6 -153,6 +163,9 @@@ EXTRA_DIST += stdbool.in.
  
  ## begin gnulib module stddef
  
++nodist_pkginclude_HEADERS += $(STDDEF_H)
++EXTRA_HEADERS += stddef.h
++
  BUILT_SOURCES += $(STDDEF_H)
  
  # We need the following in order to create <stddef.h> when the system
@@@ -186,6 -186,6 +199,8 @@@ EXTRA_libgnu_a_SOURCES += strftime.
  
  ## begin gnulib module time
  
++nodist_pkginclude_HEADERS += time.h
++
  BUILT_SOURCES += time.h
  
  # We need the following in order to create <time.h> when the system
@@@ -236,6 -236,6 +251,8 @@@ EXTRA_libgnu_a_SOURCES += time_r.
  
  ## begin gnulib module unistd
  
++nodist_pkginclude_HEADERS += unistd.h
++
  BUILT_SOURCES += unistd.h
  
  # We need the following in order to create an empty placeholder for
@@@ -367,6 -367,6 +384,8 @@@ EXTRA_DIST += unistd.in.
  
  ## begin gnulib module warn-on-use
  
++nodist_pkginclude_HEADERS += warn-on-use.h
++
  BUILT_SOURCES += warn-on-use.h
  # The warn-on-use.h that gets inserted into generated .h files is the same as
  # build-aux/warn-on-use.h, except that it has the copyright header cut off.

diff --cc lib/ignore-value.h
index 5e683bbb533e1f2c602b0f6849ffe83bc5673ff4,5e683bbb533e1f2c602b0f6849ffe83bc5673ff4..cdb3b3c792f13589d13a4ebc6a9131cdd538ccb5
--- 1/lib/ignore-value.h
--- 2/lib/ignore-value.h
+++ b/lib/ignore-value.h
@@@ -32,8 -32,8 +32,8 @@@
     "copy.c:233: warning: ignoring return value of 'fchown',
     declared with attribute warn_unused_result".  */
  
--#ifndef _GL_IGNORE_VALUE_H
--# define _GL_IGNORE_VALUE_H
++#ifndef _gl_GL_IGNORE_VALUE_H
++# define _gl_GL_IGNORE_VALUE_H
  
  # ifndef ATTRIBUTE_DEPRECATED
  /* The __attribute__((__deprecated__)) feature

diff --cc lib/stdbool.in.h
index b64dc75b20cc57836e4fdc8e6e2cd5f6e316c5f9,b64dc75b20cc57836e4fdc8e6e2cd5f6e316c5f9..e3a778d40a1801c8d6bda6a9988ca2388b60dfcf
--- 1/lib/stdbool.in.h
--- 2/lib/stdbool.in.h
+++ b/lib/stdbool.in.h
@@@ -15,8 -15,8 +15,8 @@@
     along with this program; if not, write to the Free Software Foundation,
     Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
  
--#ifndef _GL_STDBOOL_H
--#define _GL_STDBOOL_H
++#ifndef _gl_GL_STDBOOL_H
++#define _gl_GL_STDBOOL_H
  
  /* ISO C 99 <stdbool.h> for platforms that lack it.  */
  
@@@ -119,4 -119,4 +119,4 @@@ typedef enum { _Bool_must_promote_to_in
  #define true 1
  #define __bool_true_false_are_defined 1
  
--#endif /* _GL_STDBOOL_H */
++#endif /* _gl_GL_STDBOOL_H */

diff --cc lib/stddef.in.h
index 62a91a7a6a3a5965e505b72f16d86d03423bbc5d,62a91a7a6a3a5965e505b72f16d86d03423bbc5d..f2d5a4fdad904295f9f2d4b447e8c21af900adcb
--- 1/lib/stddef.in.h
--- 2/lib/stddef.in.h
+++ b/lib/stddef.in.h
@@@ -38,9 -38,9 +38,9 @@@
     remember if special invocation has ever been used to obtain wint_t,
     in which case we need to clean up NULL yet again.  */
  
--# if !(defined _GL_STDDEF_H && defined _GL_STDDEF_WINT_T)
++# if !(defined _gl_GL_STDDEF_H && defined _GL_STDDEF_WINT_T)
  #  ifdef __need_wint_t
--#   undef _GL_STDDEF_H
++#   undef _gl_GL_STDDEF_H
  #   define _GL_STDDEF_WINT_T
  #  endif
  #  @INCLUDE_NEXT@ @NEXT_STDDEF_H@
@@@ -49,14 -49,14 +49,14 @@@
  #else
  /* Normal invocation convention.  */
  
--# ifndef _GL_STDDEF_H
++# ifndef _gl_GL_STDDEF_H
  
  /* The include_next requires a split double-inclusion guard.  */
  
  #  @INCLUDE_NEXT@ @NEXT_STDDEF_H@
  
--#  ifndef _GL_STDDEF_H
--#   define _GL_STDDEF_H
++#  ifndef _gl_GL_STDDEF_H
++#   define _gl_GL_STDDEF_H
  
  /* On NetBSD 5.0, the definition of NULL lacks proper parentheses.  */
  #if @REPLACE_NULL@
@@@ -82,6 -82,6 +82,6 @@@
  # define wchar_t int
  #endif
  
--#  endif /* _GL_STDDEF_H */
--# endif /* _GL_STDDEF_H */
++#  endif /* _gl_GL_STDDEF_H */
++# endif /* _gl_GL_STDDEF_H */
  #endif /* __need_XXX */

diff --cc lib/time.in.h
index 2d6da7161fb041a8167aa1bd2e39752da5a358bc,2d6da7161fb041a8167aa1bd2e39752da5a358bc..2bfe9208d1557100be3c1f55ff689022a0c9d9e2
--- 1/lib/time.in.h
--- 2/lib/time.in.h
+++ b/lib/time.in.h
@@@ -28,13 -28,13 +28,13 @@@
     without adding our own declarations.  */
  #if (defined __need_time_t || defined __need_clock_t \
       || defined __need_timespec \
--     || defined _GL_TIME_H)
++     || defined _gl_GL_TIME_H)
  
  # @INCLUDE_NEXT@ @NEXT_TIME_H@
  
  #else
  
--# define _GL_TIME_H
++# define _gl_GL_TIME_H
  
  # @INCLUDE_NEXT@ @NEXT_TIME_H@
  

diff --cc lib/unistd.in.h
index 14d685e0c8faac873db558da86603fbb2dc94e41,14d685e0c8faac873db558da86603fbb2dc94e41..7a64cb5fe4469481883abbb3ac42ea4dd6623e7a
--- 1/lib/unistd.in.h
--- 2/lib/unistd.in.h
+++ b/lib/unistd.in.h
@@@ -25,7 -25,7 +25,7 @@@
       but we need to ensure that both the system <unistd.h> and <winsock2.h>
       are completely included before we replace gethostname.  */
  #if @GNULIB_GETHOSTNAME@ && @UNISTD_H_HAVE_WINSOCK2_H@ \
--  && !defined _GL_WINSOCK2_H_WITNESS && defined _WINSOCK2_H
++  && !defined _gl_GL_WINSOCK2_H_WITNESS && defined _WINSOCK2_H
  /* <unistd.h> is being indirectly included for the first time from
     <winsock2.h>; avoid declaring any overrides.  */
  # if @HAVE_UNISTD_H@
@@@ -33,10 -33,10 +33,10 @@@
  # else
  #  error unexpected; report this to bug-gnulib@gnu.org
  # endif
--# define _GL_WINSOCK2_H_WITNESS
++# define _gl_GL_WINSOCK2_H_WITNESS
  
  /* Normal invocation.  */
--#elif !defined _GL_UNISTD_H
++#elif !defined _gl_GL_UNISTD_H
  
  /* The include_next requires a split double-inclusion guard.  */
  #if @HAVE_UNISTD_H@
@@@ -45,14 -45,14 +45,14 @@@
  
  /* Get all possible declarations of gethostname().  */
  #if @GNULIB_GETHOSTNAME@ && @UNISTD_H_HAVE_WINSOCK2_H@ \
--  && !defined _GL_INCLUDING_WINSOCK2_H
--# define _GL_INCLUDING_WINSOCK2_H
++  && !defined _gl_GL_INCLUDING_WINSOCK2_H
++# define _gl_GL_INCLUDING_WINSOCK2_H
  # include <winsock2.h>
--# undef _GL_INCLUDING_WINSOCK2_H
++# undef _gl_GL_INCLUDING_WINSOCK2_H
  #endif
  
--#if !defined _GL_UNISTD_H && !defined _GL_INCLUDING_WINSOCK2_H
--#define _GL_UNISTD_H
++#if !defined _gl_GL_UNISTD_H && !defined _GL_INCLUDING_WINSOCK2_H
++#define _gl_GL_UNISTD_H
  
  /* NetBSD 5.0 mis-defines NULL.  Also get size_t.  */
  #include <stddef.h>
@@@ -119,7 -119,7 +119,7 @@@
  #if @GNULIB_GETHOSTNAME@
  /* Get all possible declarations of gethostname().  */
  # if @UNISTD_H_HAVE_WINSOCK2_H@
--#  if !defined _GL_SYS_SOCKET_H
++#  if !defined _gl_GL_SYS_SOCKET_H
  #   if !(defined __cplusplus && defined GNULIB_NAMESPACE)
  #    undef socket
  #    define socket              socket_used_without_including_sys_socket_h
@@@ -180,7 -180,7 +180,7 @@@
                        "shutdown() used without including <sys/socket.h>");
  #   endif
  #  endif
--#  if !defined _GL_SYS_SELECT_H
++#  if !defined _gl_GL_SYS_SELECT_H
  #   if !(defined __cplusplus && defined GNULIB_NAMESPACE)
  #    undef select
  #    define select              select_used_without_including_sys_select_h
@@@ -1374,5 -1374,5 +1374,5 @@@ _GL_CXXALIASWARN (write)
  #endif
  
  
--#endif /* _GL_UNISTD_H */
--#endif /* _GL_UNISTD_H */
++#endif /* _gl_GL_UNISTD_H */
++#endif /* _gl_GL_UNISTD_H */